Auto merge of #1154 - tshepang:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 13 Jan 2015 17:36:14 +0000 (17:36 +0000)
committerbors <bors@rust-lang.org>
Tue, 13 Jan 2015 17:36:14 +0000 (17:36 +0000)

Trivial merge